cleaned up vars/all for better readability
cleaned up vars/all for better readability
testes