Minor renaming variables and deleting unnecessary toString calls.