Rename local variable
Return 404 on unknown task
Small refactoring