Refactor in progress for work done so far the training