Removes add_this
Cleans code
Adds share this