just refactoring puls removing unused vars