Improve kill behavior