Refactoring of modifier setting