Update to spacing and comments