slight code layout change