remove comments and move public methods togather