Fix a couple code climate issues