Even more cleaning in services.js and in controllers