Clean up and more comments