Clean up and comment