more minnor codeclimate fixes