Fixed kill, cleaned code