refactor varaibls name