Improve consistency in error messages

Use the same spacing and formatting rules.