Refactor Sinatra & Webmock