Some indentation and comment update