Refine core formatic

Cleaning house a bit to make things easier to use, a little more production ready.