code-climate fixes