* A bit of refactoring