Slight refactoring of Brewer code