Small formatting changes

Conflicts:
	init
Sync docs by running `make doc`