code enhancements

Change-Id: If2db62ee128ac1296dd546b55f6dd2edcca1554a