-More cleanup and comments