changes & cleanup