Slight code layout changes