renamed classes to be sensible, tweaked output format