fix on BT parsing and code cleaning