-minor code cleanup & log tag changes.