more cleaning, added comments