Small refactory