Rework a bit code.