Code clean up.

If you don't see anymore code clean ups right after this, then it means
my commits are finally successful. Here goes.