Made code more legible