simplifying and correcting