Formatting and sync from BeerGang