Fixes formatting and off-by-one oversight