removed some unnecessary markup