code cleanup 7/28/14