creating list of checkdefinitions only once
pretty code
fixing broken class-based checks