cleanup user code structure