Made code a bit more readable