Some clean up and comments