Improved Code a bit

Uuughh I had some git problems