Clean up consistency and language