Correcting variable names and presentation
Formatting and naming TP2