Refactoring going on...