More clean up and comments