fixed
clean up code