Cleanup and beautification
Beautify a little more