Clean up and improve code comments