Code cleanup

Signed-off-by: jsu <jsu@falconfone.com>