Structural changes + cleaned up services.js