Minor indentation and formatting fixes