clarified variables
forgot to commit changes caused by refactoring