Starting variables refactor.