Some minor code cleaning
Implemented the basic transformations as a basic 'module'. So its easier as you do not have to write in my code.