Tighten up init module

Collapses some non-critical nested areas.