Cleaning up and expanding -- generic commit message.