Cleanup and styling according to https://github.com/airbnb/javascript style guide.
Tagging 2.8.0