fix naming convention
fix cops
tests! fixes #1