Simplifying and fixing the markup for the meta part