Variable renaming, param removing