Some cleaning up and cosmetic fixes.