code cleanup pt 2