Quality: clean up