More formatting changes (squash up)
more formatting... squash up
WIP: Moving logging function into a testable module