continuing facebook refactor, clean up, etc