Bm - Cleanup and minor tweaks