check: More code cleanup