slight cleanup of bootstrap