Make formatting more consistent