code cleanup:self check