code cleanup Feb 18th --jle