Added some nice cleanup and comments