requesetiong Full refactor suggestions

Extra `,`