fixed unneeded IFs
pretty printing, removed unused lines
Refractored code
Finished Refractoring
Readability