Refacting #3