Fix indentation and add comments