Making the code a bit more readeable