refactoring master blade