comments / cleanup