TSTGITPLUG-1 refactoring-2