Clarifying code to prepare for pr#136 https://github.com/piwik/piwik/pull/136