No point in clearing local pointers then returning.
Also fix up some CodingStyle nits.
Signed-off-by: Dave Jones <davej@redhat.com>