More cleanup
Fix off by 1 error