started switching to promises, some cleanup and unification