code comments, cleanups, simplify