npe, refactoring