Cleanup whitespace
Minor tweak to minimize log messages
Log better message when test/sim files are missing
Readability: try to fit all lines into 80 columns