Removed some unnecessary markup