Minor cleanup and improvement.