Make kill a bit better and cleaner.