DNN-5733 - Applied refactoring and cleanup to TabVersionMaker