Small tweaks

- move bluebird to dependencies
- Rename some functions

![](http://media.giphy.com/media/T0x2SDlw6ojKM/giphy.gif)