A formatting fix, and move one line to a better location.