Changes because of the changed logfile format, also made some readability improvements