Code clean up and adding facebook activity