trying to improve on coding style - thanks Mario!