Changed a log message and did some cleanup