code cleanup; preparation for albert's new log format