Refactor bitfield usage