blake: some fine tuning + cleanup