Some general cleanup work.

Next: to update the README installation instructions.