Code clean up, no functional change!

Signed-off-by: Malahal Naineni <malahal@us.ibm.com>