Better syntax and typo fix
Modified behaivour of dict definition

Dictionary definition is now much more simple, the ':'s are
unnessecary.