Refactor tiny types