Refactoring + reformatting of promise based routes