Refactor small