add more code refactoring