- [misc] simplified variables names for better readability