clean up classes transformer and add comments