Refactoring, need more refactoring.