Update extra_js to body_close to be more abstract/semantic
Remove superfluous namespacing