Don't create redundant promises

Just use promise chaining