working on main library....mostly style, but more to ensure I understand.

Next is to work on "scan and target" reuse