More refactoring on the bar.