Made code a little more readable