Minor cleanup. #