Changing routes to be more functional