Added deletion of target when user killed, as well as minor formatting