cleaned up vars/all for better readability