Performed refactoring for the project according to the guidelines