Slight code simplication.