One day market factors refactoring

One day market factors refactoring