refactoring
time to implement transformations
some code cleanup