Wking on refactoring