cleanup code more