update 2

code cleanup 2