Made big changes to formatting of the code and more minor tweaks March 19, 2013