[Issue #364] Better handling of indentation after kill
Code cleanup (let -> when-let, remove unnecessary conditionals)