Add reek
Refactor to reduce reek warnings