Do more refactoring