Further clean up and comments