:sunrise: cleaning up main module, require statements.