Cleaning up code a bit.  #38