Refactory 1 finished for OO