Updated with suggested changes (thanks @garrettr!)