Cleaned up AABB a bit