Cleans up a bit
Merge github.com:steria/log-parser