na - refactoring even more