Rename embarrassing var name that was supposed to be temporary
Remove unused variable