Improve readability and opens a door to 404 errors handling