kBishops code cleanup