Minor class renaming and add comments