Clean up config
Grammar