Fix Permissions

* Clean up style
* Fix permissions on various files that don't need execute bit set
* No functional changes
* Closes #1854