fix indents and add comments