Code clean up

Signed-off-by: browniefed <iam@browniefed.com>
More cleanup

Signed-off-by: browniefed <iam@browniefed.com>