cleaned up B2 a bit