Small code cleanup using a default interface