Add waiter and food limitations
First part of cleanup
Final cleanup
Add astyle