Refactor StatementModifier