Small optimization
Language clean up