refactor
cleanup code