Cleaned up code a bit.

Ran CodeMaid on the code base to clean things up.
Updated some packages.