Refactoring
Major refactoring, removed instrument from trader base