#157 - corrected content with microdata
#157 - refactor