Nit: { } when case handling takes > 1 line ...