Finished with 1 part of refactoring