white spaces handling
toString() fixes