Mon refactor