(cleanup) Simplify the code that return 404 response