Code cleanup for routing.js