Change module inclusion order
No need for that stuff
Implement locale sub-generator
Always use braces in flow-control