mas refactor