REFACTOR: remove variables and work with methods by ahuva