Changed routing functions, removed all console.log instances