99 scala problems P07 done
Make some minor modifications