More minor refactorings
Started with resize; wip, not compiling