Code climate cleanup