Cleaned up log parsing and filtering

Change-Id: I25280a1de9212a7ad1f8185cb01c60a9a6fd5d20