bluetooth work, slight cleanup