Some prettiness fixes