Updated database structure

To fix a very minor bug that could print trades object with Security ID null
Formating, white space changes