Reformat the source
Added post-scan callback