Restructure Promise utilization