fixes from code climate