made class names more semantic