Bit field cleanup