Moved inner check method to sub super class, cleaned up classes
Overlooked refactoring for check method to use new helper method