Clean up/rework checker code