clean up code
test