monday refactoring