Clean up

clean up comments and code