Some more edits
Cleaned up some more cruft.