Clean up

clean up code