Code climate cleanups