Bug fixes
Get rid of Promise alias and correct style