Fix indentation and folding