Removing accidental comment out, fixing class constructor