- Fix indentation and comments