remove unused id param
compress uneeded assignment