Final touches to clean up some of the code + comments