Simplifying and Refactoring Introductory Calculus