update 3

code cleanup 3