Tidied up CheckerImpl