Cleaned and removed unnecessary lines