cleaned up and shortened class names