Tidy status messages a bit