Reindented file
Added --log-output support