Slight code layout improvement