Refactored code for _make functions so that they don't indent quite so in, who needs promises?