Refactor awkward clause