More fixes from code climate