Changed: clean up