Clean a little, readjust brew handler init