Refactor to use Express router