Code refactoring completed