Readability improvements Scan.pm