Small refacotring...