Clean up
Refactored code to be pretty