Search output cleaned up a bit further