Indentation refactor and add some comment