Rearranged statements and removed truncation in favour of selective deletion