MJ:simple refactoring