Basic refactoring into some OO