[James] making sure the facility name and id are recorded when the registration occurs
[James] added a check to make sure facility data is stored during initial registration
cleanup based on PMD findings