Tweak
Alphabetize
DRY
Housecleaning
Make bitfields transient