simplifying awaiter class