Clean up some of checker