Fix an off-by-one + cosmetic