clean code
rename some fields