Fixing poor markup