Switch all promises error handlers to then format
Simplify code and documentation