WIP Microformat and cleanning