small OCD as I read.

* remove unneeded then
* prefer multi-line statements (easier to set a breakpoint and on my eyes)
* simply return the promise, rather then the intermediate promise
*