Finished subscription operations, minor refactoring.