Clean up.

Cleaned up some code for better reading. Also got the root checker
working, just can't think of a clean way to kill it once it's running
and valid root credentials are entered...