Language clean up