some cleanup and a bit of schema.org integration