Refactor to microformats2