Refactor tweak bar code