Cleaning up the style a little
Initial checkin for week 2