Simplify, document
Kill dir
Reorder
Whitespace
Moved together with the rest of initializers