Refactor: improve var namings, tell us specifically what each function accepts and returns