Only grap valid modifier
Optimize and clan up