* More internal refactoring