requesetiong Full refactor suggestions