Slight code improvements.