Cleaned up toString to be more JSON-like