Format

more format stuff for prettiness factor