cleanup code

cleanup code