file clean up + combined modm/shiftmask var added