Spruce more formatting