Improve some expression