slight cleanup for BS