CodeCimate cleanup