Merged checks to one related class for preformance