General cleanup.

* Some parts had sudo check and didn't need it.
* Reorg different sections to be clearer.