Making the code slightly easier to maintain