Cleanup based on ACS Commons team feedback