Prog Assignment 2 less comments