Clean up

Implemented suggested changes + Box class. Testing still to come, will
finish it sometime tomorrow.