A bit refactoring, to make cleaner.