na - refactored and code clean up (for simplicity).