significant cleanup
refactor discreet strategy file