documenting code
Minor refactor around scanning to unify arch