Modifications based off a quick inspection for the interns

My recommendations.