Refactor: Remane in some variables