refactor - start to drop usage of -> in transformatino function names