Refactored OCP class...

... Simplified header inclusion