1, 2, 3 and includes recommit

Sorted out the differences seen in the indentation of the code