TSTGITPLUG-1 refactoring-1