Tweaked styleguide to be more consistent with current styles @RF