Refactoring Transform classes...