Fixed toString() methods to not have newlines