404 refactor