Quotation transform refactoring

Just to make it perfect :P