Added support for getting org members + minor code cleanup