refactoring according to the review of the SST transformation