Format and minor stuff

Changing some minor stuff.