Some formatting to made the code more legible