#69 OCD about multiple returns