Pack-scan changes

There are trailing whitespaces on this line :) I'll fix it up before merging.