No ticket: Clean up code and comments