Remove pointless bitwise operations
Convert fields to local variables