ToolkitServiceParameter minor refactoring and adding docblocks