Clean up and comments