Minor improvement. Cleanup.