Minor aesthetic reordering of lines in build file