Cleanup, rewrite some stuff w/ underscore.