Code refactoring procedure has been applied