Added language maker code
Removed old format dict