remove double return

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
switch snake case out in favor of camel case

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>