Remove redundant code
Add a class to create a 33 bit word