minor aesthetic changes
simplified dictionary construction