Removing logic from PersonnelView
Tidying some method names