Clean up code, make it neat