cleanup
improve autosize