Make the code a bit more readable