Fixed indentation and add some comments