removed a bunch of ToString() calls