cleaned up some promises