small refactoring

Signed-off-by: Jonathan Berkhahn <jaberkha@us.ibm.com>