Updated log usage. Some minimal cleanup.