re-org and cleanup of last PR