cleanup code #2