Cleaned up duplicate markup