cleaned

removed unused variables and made it visualy cleaner.