Continuing to clean up the resource module...