name changes and remove useless vars