inspection comment fix, refactoring