Add in logger calls throughout code base
Formatting tweak