Refactoring logstat bundle