(PUP-2995) Change custom OID format and apply code advices.

* As suggested by @ffrank, custom OID file format was changed to use Hash structure.
* Apply code modifications suggested by @ferventcoder.