Refactor code OO-STYLE