Add comments, rename a class in demo project