OData isolation + minor refactoring/reformatting