refactoring and renaming
changed 1 more var name lol