continue code refactoring