code cleanup, and move to 152