Another refactoring work