BEAR, not Bear
code cleaning