Remove unncessary markup and improve examples