Make formatting more consistent

#719