Minor cleanup reg. #7