RestRequestor refactoring/Findbugs added