Change accessibility of method to allow controls to be moved out to separate project
Fix bug where national number wasn't formatted via constructor