cleanup, format, added metric class canonical name