Facebook sharing integration and some clean-up