formatted and corrected