More formatting to NHSDatabaseController and use more path objects