Cleaner markup