code and comment clean up