Made formatting more uniform.