Fixed and removed unnecessary labels