First rewrite of student code
Cut down 50 lines in no time :)
Another axing of code lines