[ENHANCE] lib/model: journal and vat composite keys
[TASK] cleanup code