fix interceptor promises and refactor services