Code clean-up + first implementation of SecureSocial