refactor: CA and consistency
Merge pull request #28 from adamralph/tidy-up

refactor: CA and consistency