refacto: make some variable names more meaningful