Additional refactoring around log parsing