Improvement on 2nd Assignment