Move out install script to on-demand role creation
Fix logic error in term check
Standards
Move more role grabbers to the new util func