Cleaned up error messages and flash messages