fixed a bug and removed some extra markup