Minor changes to spacing and comments