Some pulling out of inner classes and moving around of methods.
Minor cleanup
Minor cleanup
Merge pull request #2153 from pveentjer/operation-service-cleanup

Operation service cleanup