Just a little clean up of comments and a little change to buffer length