small changes, mostly removal of comments / prints