merged some things to make codeclimate happy