Code reorg and bug fixes
Refactor Trade::Process and make some vars readonly