Cleaned up subscription implementation functionality and docs