Refactor: variables