Refactoring

OOP-way
are u sure this working ?