requesetiong Full refactor suggestions

Can remove space.