added comments / cleanup