rm empty line
more improvement