Code clean up around K, L, F and B problems