refactor scanners, comments