Tagcloud + code refactoring