More readable code

Hope this makes the code a bit more readable.