Code cleanup, fixing inspection issues.