TR1 Wrapper and Cleanup OT_ME

Should be mostly whitespace naming changes. No logic changes
I've also made a pointer const, (since it shouldn't be modified).