Commit before Franklin integrates our strategies
Merged Franklin's clean up
Added comments in SweepPlayer to assist Franklin's integration