Made a few minor changes to the code to clean it up and improve consistency of style