Some language clean up