Cleanup

Cleanup
Probably the final push for a while, unless something comes up.
The tool seems to be working well now.

    src/main.cpp