Cleanup, misc
Improve initial sizing