More tweaks
Some clean-up.