Clean up

Clean up comments