Bounds checking, cleaning up ...
More cleanup.