changed name

cleanup code, comment code