Implement Josh's recomendations from the review.