refactor time period and instrument identifiers
refactor broker code
fix json mapping read / writes