Completed the Mixup exercise.

Code looks much nicer now!