Clean up code and comments