Clean up code

Makes it more readable.