Variables: added property name interpolation, reformatting

...