Simplify a bit and remove redundant blank lines