Plurk: Refactor part 2