Clean up

Clean up code and comments