Nick007J small refactoring