THINK-173-TRN

Update and Tidy