Code refactoring, introducing a class for CMS-specific site accounting