fixed more indentation and formatting