iToolkitService minor refactoring and adding docblocks