Bug Fixing: #341 - remove custom ordered dict and replace it with built in