refactor: address CA violations

#89