Removed need for internal byte shift constant