Clean-up, define all dict literals with {}