Renamed classes for shares, remove redundant comments