Cleaned and corrected