Additional reformatting to unify style