na - refactoring