Change transformation modules for better readability