Making this a little more "proper" with respect to the exercise