Remove some unneeded whitespace/whiteline parts