Cleaning up comment headers, moving brewery onto beer.