Add comments and fix indents