Code Cleanup

Spenser Shumaker <sshumake@redhat.com>