Small tweaks

- move bluebird to dependencies
- Rename some functions