GT-765 loots of refactoring