404 response, refactored responses in to handlers