milestone#2 code cleanup#1