Improve Code Quality of check