General cleanup

* Cleanup of indentation and spacing
* Replacing all instances of double quotes with single quotes