#12 Enhancements in variable name