Minor rewrite and fix formatting