RestAdapter code clean-up