Some cleaning. Preparing the Waiter interface