Cleaned up org.getUsers to use existing patterns