remove some useless code
rename some attributes