Fall back to dict if OrderedDict unavailable
Code reordering and renaming
Small edits&fixes
Use OA context from w3.org