Clean up Grammar for clarity and efficiency