Code comment clean up