Some cleanup
Introduced a BoundingBox object