pushing stuff around to try and fix codeclimate