Minor code cleanup.

Signed-off-by: William <william@amovens.com>
Minor fixes.

Signed-off-by: William <william@amovens.com>