Cleanup and added truisms.