Minor changes to styleguide
Switch to using rhythm keywords where appropriate
Add consistant commenting