Refactoring. Code styling fixes, transformer factory test.