Applying better markup