Refactoring into classes -UT