Cleaned up promise syntax