A few more minor cleanups. Now it is back to normal again but in awesome.