Reordering to make file more readable