Minor log message fixes
Minor code reformatting and log message refactoring