Aesthetic clean-up!

Aesthetic clean up :)