Cleanup.
Added rectangle packing.