Add logging - minor cleanup.