mltries refactoring part 15