proglang hw2 cleaned up