Improve Dictionary access
removed redundant else