Comments and cleaning up