Perform some code cleanup in areas that are about to be altered.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>