Nicer Homework 2 ;)