refactor: address CA violations
Merge pull request #97 from adamralph/89-code-analysis

refactor: address CA violations