small sizing refactor