Quick fix

-Some readability fixes
-Removed an unused file