Small refact