na - refactoring like mad