PARTIAL: Applied changes from @jamesls' first round of feedback.