[refactor] remove unnecessary code, use proper variable name