Fix typos in omni_bravo and cleanup