Pack some more structures

Plus a bit of reformatting.