Clean up & comments