highlight code cleanup and comments