successful NeoBundle conversion; small cleanup