Further cleanup
Moved dimensions into Box class