Style guide changes, tests and updated docs