Comments, code cleanup.