Code clean up , query user based on role method