Beginning to refactor (flash messages as partial)