WIP tune diagnostic logging levels
WIP whitespace