Made the code a bit more readable