Pseudotrivial refactoring