sof refactoring