toolkitservicexml minor refactoring and adding docblocks