Using regular expressions to hack our way towards AMDfication

And tweaks to our code styles
not rendering quite right?