requesetiong Full refactor suggestions

Can remove this space.