Code layout changes