Made formatting more consistent