continued transform refactoring