1) Few changes to formatting
2) Added comments