Milestone 6: Comments and cleanup.