small refactoring and reorganizing. blog mock