less code
rename