Updates to fix log formatting
Additional style changes.