updated ignore masks
Reorganized constants - move locally as much as possible