one day market factors refactoring
one day market factors refactoring