Make code layout more readable