Comments, and cleanup