Delete blank lines, use a couple of syntactic simplifications