update comments and rename implementations of classes