coding style
rename property
improve code