Cleaned up the markup