Fixed killing removing all the whitespace between tokens. Also reindents according to mode now.