Refactor Facebook a bit