Code cleanup

cleanup