change & cleanup