Fix indentation and comments