refacotoring variables