Removed superfluous ToString()s

and other small refactorings