Cleanup, unittests, use getter funcs for sizes