Continue of code refactoring