fix whitespace and other cleanup
Merge pull request #596 from dethe/auto_jsonify_storage

fix whitespace and other cleanup