Reformulated Promises, small improvements