add comment and rename class