Small speed improvements. More formatting stuff.