rename of variables
remove of unused imports