Remove serving information
Cleanup some spacing