Changed subscription message handling logic
Some minor comment/parameter names cleanup