g-analytics + refactoring