Code layout change