CleanUp

Tab to spaces and delete a file inecessary
Reorganice a piece of code