cleaned up lab 2 and removed the unneeded functions