Clean up code and spacing