More logical ordering of lines.