A bit of useless refactoring