Simplifying the exercise even more, and add more to the bonus task