clean up
task 2 rename