Still cleaning and getting rid of unneeded lines :)