Minor improvement and cleanup.