Some code and documentation cleanup.