cosmetic: clarify some variable names
add more ideas