cleaned up services.js