New var name to make it more comprehensive
Changes to follow the styleguide, proposed by narfbg (thanks to him)