Problem2 done
Stylistic changes - problem 1 and 2