clean up code2