one day market factors refactoring