Code cleanup

Signed-off-by: chatgris <jboyer@af83.com>