minor improvements of variable types