Code review!

Thanks to @maryrosecook and @hausdorff for helping.