Refactor: extract transforms