Changed struct to class
Comments and removal point click